Merge cherrypicks of [15567411, 15567547, 15567447, 15567095, 15567367, 15566999, 15567396, 15567397, 15567412, 15567413, 15567096, 15567448, 15567449, 15567097, 15567098, 15567450, 15567099, 15567398, 15567100, 15567621, 15567622, 15567468, 15567000] into rvc-qpr3-release am: 350b70f0ed Original change: https://googleplex-android-review.googlesource.com/c/platform/system/apex/+/15567469 Change-Id: I323d7bca06fd4a344c35b2d2a8b4ffc4642db6ee